Extract more code in seperate files
Extract dart code in seperate files