Cleanup: removing redundant project + refactoring