Remove src dir, and just use lib directly

-Also lint specs