Reorganized
Removes unneed files and adds a few stuff