Fixed some new dart lang structure issues, added pubspec and reorganised