Removed unnecessary dependencies, moved one dependency to proper folder