some folder changes
some "exceptionhandling"