cleaned up files, and placed all into one file