Changed beta to non-beta, moved the file structure out of beta folder