* Reordering structure
* Removing not used test folder.