One more day

Folder clean up