Cleaned up and put in folders, moving to beta