Removing old unused classes - adding @group test annotations

Removes old code, fixes #1