Directory cleanup

* Merged in Jithu's and Michael's forks
* Cleaned up directory