Migrtated to route directory
Note added about macros.