Upload test and code
reorganised directories