Reorganised some of the folder structure + setup require config