Updated Structure

Updated structure for better management of membership section.

Signed-off-by: Adam Jolicoeur <adam.jolicoeur@gmail.com>