Removed unwanted modules
Merged code
working on form.php(in Progress)