Complete transition to configurable include dir

Rearranged some includes to gradually shrink include.php
Fixed bug in addRating.php