reorganization
remove html from master