Deleting old files
Added new files for major refactoring