Added directive for ibu
Started refactoring