Changed project structure a bit and removed extranneous dependencies