re organize to MVP project