Reverse project rearrangement and add travis-ci fix from NAKPlaybackIndicatorView