Fix Mac compiling issue
sort lines
Remove unused files.
structure folders