first commit
Structure change finished
minor changes