Refactored class/file layout some