Where should these classes go? They are here for now.