Renaming and structure

Renamed a few files and improved the structure