Joint commit: General cleanup, added changes based on feedback

General cleanup of files and organization of files as well as adding changes based on feedback. This is a joint commit/merge.