Directory changes and minor updates