reorganizing + Makefile