reorganize folder, setup makefile