Add necessary libs, moved Entry to seperate file.