Small updates and optimizations

- Removed Data folder