Renamed and refactored files and folders into more appropriate locations