Rearranged File structure to be more in line with other dart apps