Merge pull request #52 from danmcp/master

remove extra dirs
fix formatting