configured SourceSets + more cleanup