File structure altered and general cleanup