Restructure folder and new setup and revert scripts