Updated README, renamed folders