Reverted some files, makefile update
Refactoring