Fix #4 Move templates to common. Fix #5 flatten dir structure