Refactored some packaging for better organization