moved some files, fixed some html