Adding one file per module as per our design documents.