reorganized files and eliminated .haml files