moved some redundant files togethers and took out the trash