code cleanups. renamed some files.