WIP: new files and drop functions.php