Changed project structure and removed unused dependencies