Directory restructuring and readme update