Converting to gradle build. Shuffling directories.