removed Device class, updated Makeile