Made the file structure prettier