Implemented name on nav
Better directory for common services