Refactored source directory to fit sourceSet convention