Split up in modules, added make file