@emir-hasanbegovic package refactoring