Alex - Moved generic classes to seperates files