Re-organized and added the less-middleware