Move to separate project

Move to separate folder