new handlebar files and new structure