Map now seperate Files and working. TODO: create a small map, Sanitize new components