Reorganized
Removed unneed files and add new stuff