Additional update to main directory - refactoring