Rename classes so Statik is the implementation
Relocate implementation package