Service added, Controllers separated and better folder structure