[UPDATE]: Moved files to a separate project