Improve user experience and remove appcompat folder