moved exception inside namespace
cleanup
restructuralized