removed unneeded variables
Making my comment a little less bad.
Comment update.
moving common dependencies to a single folder