Split to separate files, makefile created