Better directory structure and makefile added.