minor formatting changes
renamed exception class and removed extraneous folders