adjust folder structure
remove old files

adjust folder structure