Renamed and moved forms around