Cleaning up files accoring the namespace layout