Updates

Organize files better