Create packages for better organization

Nature: Code Improvement