Create token to file singleton
Fixed weird merge issues, created an ImportUtil, updated some small things