Changed package name and started on LocationMap