Revert "moved stuff to parent"
Revert "moved stuff to parent"

This reverts commit 6445cf5c

albinsuresh/terracotta-platform,Terracotta-OSS/terracotta-platform,chrisdennis/terracotta-platform,chrisdennis/terracotta-platform,Terracotta-OSS/terracotta-platform,albinsuresh/terracotta-platform