re-organise file structure