move files to folders and include BaseCollection, BaseModel and CollectionView