Moved specs so they have the same structure as lib.
Updating todo's