Reorganizing so sensitive info is not checked in