Grand update

Modules separated, dependencies, makefiles