removed function includes and moved them to functions.php