started to clean everything and put the files where they belong