Moved internal stuff into internal packages in spaghetti-core
See #135