Directory and naming convention clean up