Rearranged folder structure, fixed a bug with map.