some renaming, add makefile