Moved forms into their own folder and renamed them