Restructure to import in correct order etc.