Directory renamed
Tests are coming together