sort files and fix travis build