optimising imports and overall structure
ext resources re-added