Refactored

Changed the name and path of pretty much everything