re-ordering files and remove stubs prints