updated file structure to current standards