Organize directories and rewrite Makefile