Restructure
Readme update