@emir-hasanbegovic refactoring package name and class names