Removed stuff that isn't relevant anylonger + cleaned up tests. Most old modules wont work - they should be refactored.
Merge