Structure, cleanup & all green tests