Moved Android files into Java folder