Refactor|WallSpec: Moved WallSpec to new source files; cleanup