Redid file structure (again). Acceptance tests now run.