Fix package structure
Repo clean
Readme fix