Revert "working on fixing file linking"

This reverts commit 903b2627781bd5b282df6f1bab435b2e672ceb31.

Conflicts:
	makefile