refactor
revamp requiring of files
more require fixes