WIP refactor directory structure to modularize external libs