Small bugfixes and structure changes
Removed _init class

Removed _init.java becouse NON generates it automatically each run and
so it is not needed to be present.