Converting old code to fit the git and removing unnecessary things.
Cleaning import in main