New structure from tests and src! all tests running green :)