Structure modification and remove some file from commit
Imrovement, bootstrap integration