Refactored symbols into separate modules. All tests green.