Revert "Refactored locations of forms and renamed appropriately"

This reverts commit 506e6ac25d6eae939168b411aaf9056950faf4dc.
Revert "Refactored locations of forms and renamed appropriately"

This reverts commit 15958055f1da930e65511383d0cad0b1e35f7974.
Revert "Refactored locations of forms and renamed appropriately"

This reverts commit f5323daf211acb24cc2dd0f71b4955d691ef0adb.