Update file structure for POJOs