Removed unused files. Improved integration between scripts