re-organized packages and got the mapper working(apparently)