Added exception, bug fix
project reorganization