added most of the file dependencies

moved stuff around