Reworked mappr file
Removed file
Merged master