Refactored source directory