Update classes and added Makefile