[#299] Refactoring imports to comply to Coding Standards