Fix issues imports and removed dynamic imports and fixed licence header year