flattened all directories, removed extraneous file, renamed all files and updated files regarding name changes
updated macros to install in correct place
flatten directory structure and fix file names to style guide form. Great work @gidden.