changed components order
release 2.0.0 into build/ folder
code organisation refactoring