CleanUp File Structure