Fixes #76
Reorganized packages in Core Impl