Refactored packages, everything is organized now