Redesign the service folder
Signed-off-by: Matthew Van Gent <scoutcamper@gmail.com>