Structuring the project by improving import function