Re-organize project to support scripts concatenation