Code cleanup

Moved classes around, removed interface