cleanup
reorganize deps
automatic include to require js… need to fix paths