I decided the restructuring needs to be more radical an directed in a much more object oriented maner.