Changed module and npm system a bit
updated everything to use new module structure