- re-factored core code
- fixed moveItem problem
- re-factored core code