Restructure and add features#14

mhaulo wants to merge 3 commits intocrofty:mastercrofty/mapstatic:masterfrom

jalkifi:restructure_and_add_featuresjalkifi/mapstatic:restructure_and_add_featuresCopy head branch name to clipboard