restructured files after having run tests