Removed some useless file and reorganized some files