Reorgonized the files and top