Refactoring! Moving files! Making a proper looking things