Cleanup of file structure