ff8455c Cleaned up missed file structure