Revert 5aca32f..33a6357

This rolls back to commit 5aca32f21473c4cc73fa6b13aad4d9d06d1cc27e.
Revert 0e38ba6..4ab1bb7

This rolls back to commit 0e38ba6ed1a69c1cd3c89881a8d40c29038cba1b.
converted to composer project