Restructure
Update readme