split into multiple files
new structure and a lot of content