Reorganization
Update paths in Travis