Rejigged object files around and added a Wall class