Correct file structure, deleted extraneous folders