Remove _site
Add basic data structure