Attempting to organize the project better
Better import syntax in main