Library files moved upper
+ Terminal class was refactored