Code files cleanup and new Makefile