Moving to subdir; adding dependencies