New Folder strucutre, finished some entities