Synced Chart colors with Bootstrap theme

Cleaned up variable names
Changed directory structure