move exceptions and traits into own folder