script cleanup, refactored packages and project "package"