Made minor changes
Merged all source and header files in to a single source file.