more file reorganization, fix makefiles