diff --git a/spec/lib/rex/proto/kerberos/model/type/encrypted_data_spec.rb b/spec/lib/rex/proto/kerberos/model/encrypted_data_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/type/encrypted_data_spec.rb
rename to spec/lib/rex/proto/kerberos/model/encrypted_data_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/field/kdc_request_body_spec.rb b/spec/lib/rex/proto/kerberos/model/kdc_request_body_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/field/kdc_request_body_spec.rb
rename to spec/lib/rex/proto/kerberos/model/kdc_request_body_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/message/kdc_request_spec.rb b/spec/lib/rex/proto/kerberos/model/kdc_request_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/message/kdc_request_spec.rb
rename to spec/lib/rex/proto/kerberos/model/kdc_request_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/message/krb_error_spec.rb b/spec/lib/rex/proto/kerberos/model/krb_error_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/message/krb_error_spec.rb
rename to spec/lib/rex/proto/kerberos/model/krb_error_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/field/pre_auth_data_spec.rb b/spec/lib/rex/proto/kerberos/model/pre_auth_data_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/field/pre_auth_data_spec.rb
rename to spec/lib/rex/proto/kerberos/model/pre_auth_data_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/field/pre_auth_enc_time_stamp_spec.rb b/spec/lib/rex/proto/kerberos/model/pre_auth_enc_time_stamp_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/field/pre_auth_enc_time_stamp_spec.rb
rename to spec/lib/rex/proto/kerberos/model/pre_auth_enc_time_stamp_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/field/pre_auth_pac_request_spec.rb b/spec/lib/rex/proto/kerberos/model/pre_auth_pac_request_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/field/pre_auth_pac_request_spec.rb
rename to spec/lib/rex/proto/kerberos/model/pre_auth_pac_request_spec.rb
diff --git a/spec/lib/rex/proto/kerberos/model/type/principal_name_spec.rb b/spec/lib/rex/proto/kerberos/model/principal_name_spec.rb
similarity index 100%
rename from spec/lib/rex/proto/kerberos/model/type/principal_name_spec.rb
rename to spec/lib/rex/proto/kerberos/model/principal_name_spec.rb