Refactoring. Created new packages