Super refactored packages in Atomic module so i can find things