Completed two parsers and changed the namespace structure a litle bit
Completed two parsers and changed the namespace structure a litle bit