Removed fs2 classes and included as library.