Changed structure again
Removed mako
Removed mako from makefile
Removed last traces of mako
Restructured source for new approach