rearranged files, added another data layer, fixed some bugs, etc