Cleaning Update

Various changes to make the branch cleaner, put files into their own
folders, merged files where possible, etc.