Refactored APT directory.