Adapted module structure, added workspace to project.