Moved part of classes from older project