changed fill_parent to match_parent
changed core module packaging, moved dependencies around