Changed directory structure + improving build&tests