reorganize / sprites / code simplification / refactoring