Bumped versions of third-party dependencies
Moved code into sub-directories