Separate code from each other
Try to fix Heroku issue