fix some exceptions, restructure folders