cleanup include and ordering of classes

we do this by removing the explicit include statements and moving the
classes, in the proopper order between the anchors
Merge pull request #100 from igalic/anchor-cleanup

cleanup include and ordering of classes