Conflict fix

Update composer.json

Redo directory structure to match current coding style, rename classe…

…s to match directory style, fix up naming conventions