Rename includes for layouts
Close #3