Major code refactoring 1

Removed unnecessary methods, dead code etc.
Moved to using F# folders for better organisation.
Unit test rationalisation