Moved static class (was in wrong folder)