Added a lot of changes
Removed data folder