Revert "Restructuring and refactoring"
Revert "Restructuring and refactoring"

This reverts commit 766278abf9e1e96cf173a50665e2a7bde7d24460.

baconface/php-webkit,demenvil/php-webkit,demenvil/php-webkit,luisbrito/php-webkit,baconface/php-webkit,baconface/php-webkit,luisbrito/php-webkit,demenvil/php-webkit,luisbrito/php-webkit