Attempt to properly restructure files