Refactoring Calculated directory