Continue refactoring, add external libraries to base DIR