Refactored directory structure; fixed icons in maps