reorganizing for easier deployment, etc