File restructure and work with Library functions