Restructure files for easier installing?