moved exception into the right package / source code folder
organized imports
Enhanced tests