refactoring - bugfix - Makefile moved