Renamed forms and did some code reorganization.