Switched to flat file hierarchy