Re-organised the files to have dedicated section ones and containers