First pass at fading functionality; renamed files