Organising imports and added a Config file system