Had a folder issue with previous commit

Subclasses and Factory files were in a folder in the last commit so i
removed them and placed them in supports files.