changed folder hierarchy, group classes into same folder