Move photonstorm classes to more appropriate places
Merge pull request #501 from Gama11/dev

Move photonstorm classes to more appropriate places