Improved scripts. Removed unused folders