Removed the fading charge

emoved the chargeFade and made sure the inactivity timeout doesn't kick
in if off. Think either or both of these resulted in some instances
where the light won't come if charging for a while.
Minor cleanup
Comments

to differentiate the version
Changed the folder structure
Merged some minor changes