lono new generator
remove task class and refactor into new classes