Reorganize project tree
Fix. Assert functions return all parameters.
Fix. message explicitly convert to string.