remove outdated files
separate and cleanup folder structure