Move photonstorm classes to more appropriate places