refactoring and adjusting some import files for ease of use