- optimize the code
- move some files
- remove DecoStones