Major update, rearranging file structure