renamed for better conventions and added makefile