reoragnize folders to follow current conventions