moved stuff into services :)
refactored routes