Refactored to more consistent includes and naming conventions

Signed-off-by: hajee <hajee@moretIA.com>
Refactord the spec's to match the lib structure

Signed-off-by: hajee <hajee@moretIA.com>