Made the module ready to be implemented

Fixed the comments, namespacing and basically everything. Next step is
to Unit Test, and maybe move some stuff around.