Everything is broken, moved to public/ and other struct changes