Reorganizate folder structure.