Renamed and moved some folders
Rearranged scripts