Move object modules into a subdirectory
Move orphan instance warning suppression to the right module