Refactored source folders