New directory layout and updates to README file