Fixing dependencies, removed unnecesary files