Use modules/ folder; updated readme