Fixed requires() calls to use new file structure