Classpath fixes.
Almost done for #3.
It compiles but does not work, something is not properly triggering.
Added submods.