Add subdir-objects

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>
Reformat

Signed-off-by: Rick Taylor <rick@tropicalstormsoftware.com>