Applied. https://github.com/ProjectSkyfire/SkyFire_5xx/pull/319 and https://github.com/ProjectSkyfire/SkyFire_5xx/pull/318. Cleanup structure and tested. Patch by Projectcore.

Signed-off-by: SkyFire <admin@projectskyfire.org>