fix and cleanup, add moodle package version