rearrange files, add Makefile