Clean up

Moved Forms into own folder
Clean up of code and remove of unused single class
Added Idispose to needed classes