Reshuffed namespaces.
In the process of changing core.php to be a class.