diff --git a/gulpfile.js b/gulpfile.js
index 48595f8..15ebc66 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -9,22 +9,15 @@ var sourcemaps = require('gulp-sourcemaps');
 
 gulp.task('compile', function() {
     gulp
-        .src('src/*.js')
+        .src('src/**/*.js')
         .pipe(sourcemaps.init())
         .pipe(babel(options))
         .pipe(sourcemaps.write('maps/'))
         .pipe(gulp.dest('dist/'));
-
-    gulp
-        .src('src/datatypes/*.js')
-        .pipe(sourcemaps.init())
-        .pipe(babel(options))
-        .pipe(sourcemaps.write('maps/'))
-        .pipe(gulp.dest('dist/datatypes/'));
 });
 
 gulp.task('watch', function() {
-    gulp.watch('src/*.js', ['compile']);
+    gulp.watch('src/**/*.js', ['compile']);
 });
 
 gulp.task('default', ['compile']);