Restructuring beta files a bit
More local changes that aren't pushable