Refactoring Makefile
Updated coding standards according to changes in module system