Fix missing method references in adding hooks
Rearrange apply_filters() position and comparison logic
Move all bare settings functions on their own to settings.php
Code cleanup of main plugin classes
Moved common functions on their own to functions.php