Directory organization issues resolved