refactoring component packages according to conventions