Reorganization & Makefile improvements