ticket: 1 Makefile moved