Paolo cleaning and restructuring

Still not fully functional, because scripts folder has to be updated!