Refactored core, customer and vendor directories