Everything is now in a folder