Consolidate directories & update comments