relocated some files.  changed some layout