Moved various State classes to their own folder
Updated require statements