re-organised folder hierarchy