Moved Classes out of the same file