Refactor directory as package