Refactor/rename packages