Cleaned up directory naming conventions