Refactored packages according to new website domain :)