Deleted duplicated files, included required libraries