diff --git a/lib/repo.rb b/lib/repo.rb
index <HASH>..<HASH> 100644
--- a/lib/repo.rb
+++ b/lib/repo.rb
@@ -25,14 +25,14 @@ require 'repo/fileaccess'
 require 'repo/context'
 require 'repo/category'
 require 'repo/objectmetadata'
-require 'repo/objectcontext'
-require 'repo/productcontext'
-require 'repo/advisorycontext'
-require 'repo/exploitcontext'
-require 'repo/payloadcontext'
-require 'repo/platformexploitcontext'
-require 'repo/bufferoverflowcontext'
-require 'repo/formatstringcontext'
+require 'repo/object'
+require 'repo/product'
+require 'repo/advisory'
+require 'repo/payloads/payloadcontext'
+require 'repo/exploits/exploitcontext'
+require 'repo/exploits/platformexploitcontext'
+require 'repo/exploits/bufferoverflowcontext'
+require 'repo/exploits/formatstringcontext'
 require 'repo/repositorymetadata'
 require 'repo/repository'
 require 'repo/cache'
* Adjusted to new contents of repo/ directory.