splitting files and adjusting makefile