Cleanup

Removing / reorganizing third party libraries