Fixed naming issues
Moved to its own folder