Fixed setup scripts and restructured module structure