Added makefile, fixed structure, added utils functions