Refactored a few things, did a bit of organization.