Started moving files to better order