Started the dev and prod restructuring