Fixed file structure, converted to haml