Refactored symbols into package