Clean up directories and includes

Just click the merge button and it will pull the changes into your repo. Then you'll need to run 'git pull --rebase' locally.