file structure adjustments, minor game refactor