Removed bad file
Moved supporting classes to library directory