Code refactoring.
Package creation for ui components.