Changed folder layout, made more modular.