ready for heroku
refatoring structure