Clean up folder structure
changed setup scripts