Organize the files into packages

File organization on android