Changing _ to - in language default code
Removing onyx dependencies
Reorganizing code