Remove libcat copy
Refactor project structure