Refactor custom libraries around the app space