Adjusted directory hierarchy and naming