Updated directory structure and readme.