Updated import functionality as everything is now part of project