Introduced namespaces and prepared for usage with composer