Reworked Core Structure

Signed-off-by: Julien 'Tyloo' Bonvarlet <jbonva@gmail.com>