Moved CSV definitions to subdirectory