Project Separated

Functionality maintained.