massive refactoring! if you pull this commit, completely clean your working dir before!
and be sure to set the dependencies for the modules right :)