Fixing file structure and naming conventions