Reverted changes on import paths