Code Refactored
- form where moved to external files