mv to src folder, fix warnings in map.cpp