Placement of Forms

Hi,

branch mohr/cleanup performs some code-cleanup related to

1. removal of code outdated by resolution of issue 99
2. new placement of source code files for forms

Cheers
Marcus