improved canvas map interactions, organized files