i have renamed some file

i have renamed some file to make it meaningful, so you need to merge it and also to delete some useless file such as line.xml etc.