Remove unneccessary decorations. Move files to their right place.