moved some files to haml