Structural changes
Imports fix
README update