moved libs, removed one uneeded import, code compiles