Added separate project
Revert "Added separate project"

This reverts commit e6f2642d680c7b1e085331e5bbaa44757c78f6b8.
Revert "Revert "Added separate project""

This reverts commit 2e7900a064b6f1736d1275834ce764bbfeb079fa.