Refactored packeages and did some renaming