Code Refactoring

Renaming files, reorganizing code, removing old code.