Moved files to android folder