Move App templates to their proper App directory