Revert "convert to mashup project"

This reverts commit aba6ae3fcff7368c25642e01ed747c9006b7e213.