Rearrange files. Develop and corrected other codes