New Activity and file renames
Rules activity added and skele functionality implemented, no filter on
menu.
Renamed files for consistency