Re-ordered some modules in make file
added all necessary modules - For now