CAMSURV-2: Fixed bug with most recent commit
Small bug fixes.
Removed unnecessary form files
Made sure that necessary folders are