Fixing file structure