organize files, rename makefile targets