Fixed module management.
It is not so "simple" any more.
Moving stuff around.
Declaring future plans and refactoring old code a bit.