Removed dead code
Structured project