Reverted the changes to the project structure. It wouldn't have worked anyway. There were problems with the inheritance and redirection of static methods.