Revert "Makefile and some moves"

this commit starts many regressions, but some changes needed

This reverts commit b057f4b1131d05d510f4aa493a6450ab5ffc7e34.