Restructure of the files and adding in min version