Moved around files so main is isolated and added solution to b