Building main modules. Adding TODO