Removed Unecessary files

Start merging modules into one file