Added refactored files to Makefile