Break out into own public classes
Remove dependencies