Update acceptance tests to drop View/Logic subdirs